Merge git://git.denx.de/u-boot-dm
authorTom Rini <[email protected]>
Tue, 10 Jan 2017 13:19:33 +0000 (08:19 -0500)
committerTom Rini <[email protected]>
Tue, 10 Jan 2017 13:19:33 +0000 (08:19 -0500)

Trivial merge